]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
keyboard: Read key width from model
authorCarlos Garnacho <carlosg@gnome.org>
Thu, 14 Apr 2022 11:20:49 +0000 (13:20 +0200)
committerFlorian Müllner <fmuellner@gnome.org>
Wed, 10 Aug 2022 17:11:26 +0000 (17:11 +0000)
Handle a "width" property to key structs in the JSON files, and
use that (so far) to give the right width to space keys in layouts.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2278>

58 files changed:
data/osk-layouts/am.json
data/osk-layouts/ara.json
data/osk-layouts/at.json
data/osk-layouts/be.json
data/osk-layouts/bg.json
data/osk-layouts/by.json
data/osk-layouts/ca.json
data/osk-layouts/ch+fr.json
data/osk-layouts/ch.json
data/osk-layouts/cz.json
data/osk-layouts/de.json
data/osk-layouts/dk.json
data/osk-layouts/ee.json
data/osk-layouts/epo.json
data/osk-layouts/es+cat.json
data/osk-layouts/es.json
data/osk-layouts/fi.json
data/osk-layouts/fr.json
data/osk-layouts/ge.json
data/osk-layouts/gr.json
data/osk-layouts/hr.json
data/osk-layouts/hu.json
data/osk-layouts/id.json
data/osk-layouts/il.json
data/osk-layouts/in+bolnagri.json
data/osk-layouts/in+mal.json
data/osk-layouts/ir.json
data/osk-layouts/is.json
data/osk-layouts/it.json
data/osk-layouts/ke.json
data/osk-layouts/kg.json
data/osk-layouts/kh.json
data/osk-layouts/la.json
data/osk-layouts/latam.json
data/osk-layouts/lt.json
data/osk-layouts/lv.json
data/osk-layouts/mk.json
data/osk-layouts/mn.json
data/osk-layouts/my.json
data/osk-layouts/nl.json
data/osk-layouts/no.json
data/osk-layouts/ph.json
data/osk-layouts/pl.json
data/osk-layouts/pt.json
data/osk-layouts/ro.json
data/osk-layouts/rs.json
data/osk-layouts/ru.json
data/osk-layouts/se.json
data/osk-layouts/si.json
data/osk-layouts/sk.json
data/osk-layouts/th.json
data/osk-layouts/tr.json
data/osk-layouts/ua.json
data/osk-layouts/uk.json
data/osk-layouts/us.json
data/osk-layouts/vn.json
data/osk-layouts/za.json
js/ui/keyboard.js

index b5957fda9babea316598b472e78e46292d44e839..8378a480f14a3a1f82bb9efe39ece561d659040f 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "hy",
   "name": "Armenian"
-}
\ No newline at end of file
+}
index d8be7c5adf8b23e4033a898b36c1d0a32cc6d798..858ecbd5f82acebc72d5abfe383cad3dea8cc0c1 100644 (file)
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "ar",
   "name": "Arabic"
-}
\ No newline at end of file
+}
index b61153a6cae075c72f04abef074c6a506f60fac6..92915212455dadedaa04174283cffdab61826863 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
index 030c87f96bf33bec33a83524c3fd35e4a19d4a89..94be844221e2641922e2c7c521964f2460dfaad5 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
index f82faf2520f3d496d59c6e4954b6a8a69bf8d263..a452fb756a94c60b7fd6c0b3f996dd985c8f68d8 100644 (file)
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "bg",
   "name": "Bulgarian"
-}
\ No newline at end of file
+}
index 4c66a770837f6f2263809603e3719beadfe5b6a9..5aa936e6b8e714329a457dd61630b259b37f4dd0 100644 (file)
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "be",
   "name": "Belarusian"
-}
\ No newline at end of file
+}
index 0a8c69c41683f15fd33b5201ee6f3a668abcd526..eaebe20b2cf66dc40a7ab0325172d86fff4f88b1 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "fr-CA",
   "name": "French Canada"
-}
\ No newline at end of file
+}
index 998bc59e45e8d36390d466cc05306853accc2284..2f1cff87afa49258186d00ea6f32b6daa501e9b2 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
index c95e7f8b0c1fae155edd17460c210c86e69ca2ac..c108c1879fc82945e6d80ea03eaa91d74f0d5bf5 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
index d491a595addca500f9d90fa54d246e47ad04efe7..35988275e574d1c4e0f09cb8f251ed86c1edfb58 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "cs",
   "name": "Czech"
-}
\ No newline at end of file
+}
index 0a71ef702d69f5ad4b105e936ff762a36160a148..9f48ba4de1fc272f9645c649d75fa85451c2f0c9 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "de",
   "name": "German"
-}
\ No newline at end of file
+}
index 7085fe7a1b60c5429cff007b2df5a373fc55690a..8ce8088340c1d5ed40965d41887acaf3a7030827 100644 (file)
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "da",
   "name": "Danish"
-}
\ No newline at end of file
+}
index 30179bdb0d10a2a63f24728e57a26c0d0e554145..e762a35d9e4e16735e4fbe03647939d9787e5b65 100644 (file)
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "et",
   "name": "Estonian"
-}
\ No newline at end of file
+}
index 9b11969c0220a03ab2851998f3b5e19396a43329..45fed380d7035f403771cccda2844befd1233b8e 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "eo",
   "name": "Esperanto"
-}
\ No newline at end of file
+}
index 93630dce958edf43d86b9b84d62bca995996808a..57e9b954b1cc8e4da7cd6fc743140514f1eac493 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "ca",
   "name": "Catalan"
-}
\ No newline at end of file
+}
index ec8193c10dfb717024f1b3248a2c107443b85dd6..8fd6e06705058d3023723aea689966c67480047d 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "es",
   "name": "Spanish"
-}
\ No newline at end of file
+}
index 94793cdda30b244aff166e6ea085a935e7f8ba40..c93d73af93e8091139e180040f2cd77523009637 100644 (file)
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "fi",
   "name": "Finnish"
-}
\ No newline at end of file
+}
index cf581b50c62e7c91cb6985992d0a2b390e8aa4ba..44803c05527f6f7820be0f9e47920ac035d85198 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "fr",
   "name": "French"
-}
\ No newline at end of file
+}
index 60952d1e533c3230289f166233ac6712ef1f8a1c..c6a1a33c99a8ed0efbab3eb19b929bad5e2dd9a2 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "ka",
   "name": "Georgian"
-}
\ No newline at end of file
+}
index 1c44a80150e558b9bd54f2b20e78c8035044e46a..4395d9d287cc53ad9f93ceb81e90d5c8847219b5 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "el",
   "name": "Greek"
-}
\ No newline at end of file
+}
index e1921e50bd5aef067453bd40bf2ff6cb17c96aa3..a800c21f51449ee375714035f95a11cb1b273fca 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "hr",
   "name": "Croatian"
-}
\ No newline at end of file
+}
index 2c829f9781e8a99ca54d58a0cf2f24a8d0177f02..e66f704c675b971d66d2c1b8e65cfbbc1d792c7d 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "hu",
   "name": "Hungarian"
-}
\ No newline at end of file
+}
index 488ae78ac68b50513869f96746e13091fc24de7c..5e7701a7937da390580c50ec8355239e3240b7c6 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "id",
   "name": "Indonesian"
-}
\ No newline at end of file
+}
index 2e9a7db8dcd65e1b836f45336652f13876989abd..de8a4a364bbf0d8e8aa5f1f498c73935e08c82c7 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "he",
   "name": "Hebrew"
-}
\ No newline at end of file
+}
index a98cb8816b54a155f5107986139851118333283c..86835df6d44da702278686c3135619774d5b148a 100644 (file)
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "hi",
   "name": "Hindi"
-}
\ No newline at end of file
+}
index 6557fbcd1a186bbac6efe07b697009b0627ac7f9..b7e5b5e7805bf131695a058299075b3174418371 100644 (file)
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
index 6f5c3ae7895cebad078c0b80d4eadcd6698ec810..6826eabfa76e23eed5bd914ea98d4af5d39a3671 100644 (file)
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
index d1acb02da6d78ebfba6a827ab8cc5bbf873f37c3..c451c8ba13262b57ad2884e9f172fe79372ca162 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "is",
   "name": "Icelandic"
-}
\ No newline at end of file
+}
index 9fa38f7aac986300bdf8370a35ee4fa53e3c463b..88ad78966e5c0598cac050de9e7625fcb9a02079 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "it",
   "name": "Italian"
-}
\ No newline at end of file
+}
index 1beb06fd032e57b857f441d5aa6b676479d5e3a8..0a7250ebba1bac62824222eb49bafda1d556077f 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "sw",
   "name": "Swahili"
-}
\ No newline at end of file
+}
index f1c190d2347c5a3ec3db6b1bb6179c2e41f9a517..c3de4d1571d54252f6e9fc27a6b50e65a388601d 100644 (file)
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "ky",
   "name": "Kirghiz"
-}
\ No newline at end of file
+}
index a860ffab77c36b5b3b3cf8314103919bae0045f5..b99ed23de87bf71c0c1f05115182311efd60e332 100644 (file)
             ]
           },
           {
+            "width": 7,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "km",
   "name": "Khmer"
-}
\ No newline at end of file
+}
index 24aec2cde69e0c3465259ccf210b4f9689dee289..b50ef2d303b8bdf267fae351a9ac831e1d562129 100644 (file)
             ]
           },
           {
+            "width": 7,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "lo",
   "name": "Lao"
-}
\ No newline at end of file
+}
index 7089e57c03f1df8617ddd6c217f6a90fdd50eb3f..955ead8d36592a32df8df57bc3bd06ba000464d7 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "es-US",
   "name": "Spanish United States"
-}
\ No newline at end of file
+}
index ee229d31f5dae7d02e8dd3d8308ff8112b7c269b..d0d7533a6f3dbdac15ccd2b6f9154697f36de15d 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "lt",
   "name": "Lithuanian"
-}
\ No newline at end of file
+}
index 6eb575f02574f39e317215c7b47e7daea2c225d4..c2dcb717a2f646cff1d8fd89156d98a04fabf2e1 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "lv",
   "name": "Latvian"
-}
\ No newline at end of file
+}
index b60640dc406700b9ea7be86ece7747148d5eedfe..9b0f3e9f95f8ae72c24f100a081e88c2c1eb8c45 100644 (file)
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "mk",
   "name": "Macedonian"
-}
\ No newline at end of file
+}
index 7911102b7332db6d2296c60c0fa12164d47b0abc..fe8e3cf71cc78ce438a7e84c6888cfb89d51b39e 100644 (file)
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "mn",
   "name": "Mongolian"
-}
\ No newline at end of file
+}
index d94d7c4b91b6f629362764b33a6840fc1fca5606..60b1fb52c764580ed24ebab59837f40f5335c8c0 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "ms",
   "name": "Malay"
-}
\ No newline at end of file
+}
index f886df8d09a9a3f23287c1e5c5901478c9104cd9..22c0aa138f986842c1fbcc44f12212a5a6d26934 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "nl",
   "name": "Dutch"
-}
\ No newline at end of file
+}
index b9bcdd1393fc654c8271acd51c9ba447cbda50c8..f0d9741f45c5bcd3b63b2ffd6457448e3ccf030d 100644 (file)
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
index aa348c7a932b489fd88b8fc2c35688f71eacf90f..7d838f4ceabef190a43b1eadecabc43e456b95d9 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "fil",
   "name": "Filipino"
-}
\ No newline at end of file
+}
index 7910c02316eed36d35cc7021013553e0acf285a7..ea5e547fc768580c1e31967b36df3a20dd5bef26 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "pl",
   "name": "Polish"
-}
\ No newline at end of file
+}
index a580a326516a5d0760721938eb024486697cd1b8..e19bbb387629428d417f17b212aed7740676745c 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "pt-PT",
   "name": "Portuguese Portugal"
-}
\ No newline at end of file
+}
index 156c355c5821e253b68939cd61093e92f53f9bb2..f9ea966598b92dbc91d1491771d0eb6546a5d909 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "ro",
   "name": "Romanian"
-}
\ No newline at end of file
+}
index a61187df3d1a4cb948842e4bc13370d0cc419f04..d9b3ad4da3ae440051067a5943e4a076417319be 100644 (file)
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "sr",
   "name": "Serbian"
-}
\ No newline at end of file
+}
index 2cf0469df3e5644e1bb5afb290bb42a964f58465..0f574b62874bb3d20a5c7491073005c221e1c928 100644 (file)
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "ru",
   "name": "Russian"
-}
\ No newline at end of file
+}
index cc24b1439f5ce6aa101cb588872a377bd301db91..a378ffe6a0f0f5b49df446eb3ddaa4a7b040c57f 100644 (file)
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "sv",
   "name": "Swedish"
-}
\ No newline at end of file
+}
index dfaf2d68481e976a9c63fdb195372b9197a706a6..e39159f4336ed40f4f438f0d3290fad11e2d44b4 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "sl",
   "name": "Slovenian"
-}
\ No newline at end of file
+}
index a6f9075d36e554d5a85c4a386334d3e98b5d6c41..40c68a68a2e0a86a792ae396af1d5a94d1a392e6 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "sk",
   "name": "Slovak"
-}
\ No newline at end of file
+}
index 9ab336cca689758fdeb7add46413468cc8190789..4f110e9d56f2b5990ad4c8af6f1ce0d69b8c0bb5 100644 (file)
             ]
           },
           {
+            "width": 7,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 7,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
index 2a8012d0a6b9d70ef563d53b25c78218c8884ed8..24f8d29bb628dd39167d891476d53811e49445d7 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "tr",
   "name": "Turkish"
-}
\ No newline at end of file
+}
index 25ccb44b66691007f232d6de0ecef2ae676ba6ce..b2b2b0b98102a07b7ffe5ce9e63b94948e84cfb7 100644 (file)
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 6,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "uk",
   "name": "Ukrainian"
-}
\ No newline at end of file
+}
index 36aa114d9c8fbf0751854c73d05eec24ba7c2763..2fb23e784f276aae24f6bdcd4826c0318050006d 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "en-GB",
   "name": "English Great Britain"
-}
\ No newline at end of file
+}
index ec5d98d76729a9dab3ceda7dca4653ef955a1a13..96d67fc2f34b6a86141cb54942151247d97d7437 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "en",
   "name": "English United States"
-}
\ No newline at end of file
+}
index 07b10d2f4edb0a4848132e7ab079f1b946ced93e..918aa456e22485e8166c61ecd3b8b7f056d4a04f 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "vi",
   "name": "Vietnamese"
-}
\ No newline at end of file
+}
index ee154fba5c43cfe590a68956ecc7354948db13bc..a28011a044b854e91d11198d2953c5373d00f0d6 100644 (file)
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 5,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
             ]
           },
           {
+            "width": 3,
             "strings": [
               " "
             ]
   ],
   "locale": "af",
   "name": "Afrikaans"
-}
\ No newline at end of file
+}
index fc4c0c59ef6a73856202ae6b2d4e8e32c9c6ac97..a14b3c2c0302fcd51f2caf631c3c967be34e192c 100644 (file)
@@ -1514,9 +1514,8 @@ var Keyboard = GObject.registerClass({
             const {strings} = key;
             let button = new Key(strings.shift(), strings);
 
-            /* Space key gets special width, dependent on the number of surrounding keys */
-            if (button.key == ' ')
-                button.setWidth(keys.length <= 3 ? 5 : 3);
+            if (key.width !== null)
+                button.setWidth(key.width);
 
             button.connect('pressed', (actor, keyval, str) => {
                 if (!Main.inputMethod.currentFocus ||